Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:29:06 +0000 (11:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 7 Jan 2011 19:29:06 +0000 (11:29 -0800)
commit96982c00c11bf6c8007c5ac354c7bdc1ebd6f4b7
tree86679ed18ed4f8c75966e81116b1e50926f4c2d4
parent0e325527e560abbe41286596274059787a47e3b8
parent9a7bbaada7e039550407de5ed88e3ff565dd75f3
Merge from mainline.